Modified current features that I am working on.