Changed layout for easier compiling