commenting and fixed