Improvements

By Zain on 10/2/2014