Adding changes made to Mobility Lab branch