Beta 2.0.5

Still fixing