less support - code reviewed and updated