changed some things, check trello