changed data model and edited api requests