simplified some features