Changed current features to reflect the code.