re-commit - modifications and fine tuning by DP :cop: