Applied same changes as skyrocket

Applied same changes as skyrocket