add features
debugged