Shahab Commit
Some improvements