edit point fully functional and changed hacks to functional code