Changes for 4.0 and Labs

Changes for 4.0 and Labs