Removed some unsused stuff, changed name for functions that use frames