Finish 1.6.3 - needs testing, use at own risk!