Implemented with new features