added undersocre, enhanced views