parallax cleanup
Merge branch 'newhome' into testing