Second modification. Add new features