merged conflicting stuff. Added 'me' tag