some changes
Almost working