Updated jetpack system