Added more logic to eight