Updated with changes from Skyrocket

Updated to match the changes from the Skyrocket