New features. Not tested. New bug