I made more updates. Hope it works.