Sixth update (Beta 1.6.4 Dev 5)