fixed and added back all the endpoints