updated some features!