improved engine and usability