Posible fix of freezing + update mockup