improve the economy class (Rafifi) and me