Implement more logic