Manually made Romesh's changes

Looked through Romesh's repository and made necessary changes to
operation files