Changed the structure of render