cleaned up from duplicated methods