landscape
merged solved
changes here and there