Settings now applies via GameplayController only
Better bounce handling