Squashed commit of lab4