Drop the Gekko related stuff in