Beta 4. Final modifications