Did some minor changes - Harsha