Input heavy upgrades!

oooo!