Scatter added
Mockups adjusted