four points are remain
working on changes