added in some stuff from blimp