comments/changed some function nameS