added several new features