updates for studio branch :)