minor tweeks to suit the new requirement