1.6.2 update/rewrite