changed naming and stuffs of endpoints