bit more logic