renamed mehtods
working code
working code