added and removed comments