4.4 updates (based on dhacker29's work)