Better for smaller devices

Commit descriptions tell it all.