Add sandbox modifications back in