added screen switching
merged