changed name and removed unused functions