5.2b v2

Major changes to 5.2b v2