updated for new features