fixed, removed depricated comments