Customer Function fixed