changed some functionality for frontend integration