rest roll upgrades

Dont integrate it!!!