added logo handling