everything but that lazy load fixed