some edits on mehran's computer