V1.0 Beta 5 - Code update