Prepared for 1.6 update