remove ceiling of elec stage plus some minor changes