add more changes
Merge pull request #1 from buddhamagnet/mope

Add more changes