Second commit with full comments