some changes
conflicts resolved
working code Integrated