Changes from helicopter88