Updated changes
need some fixing