took out other functions