Extended add cmd
testing
remove else bug