Added two more features