more logic updates