fixed up to comments