replaced all obvious incompatabilies with 5.3