optimization done
Merge branch 'master' of https://github.com/charmjunewonder/BVW-Round-2