final changes by prashant