Updated with changes from Skyrocket

Updated to match changes made to Skyrocket