removed comments, should add new ones