moved code arround per team standard