took out unnessary functions