Added new features

UNTESTED