Changes to Update 0.5.9 after Public Test