changed layout and approaches