Added inherited updates. THIS NEEDS A LOT OF TESTING THOUGH!