Changing back to models format