Second commit (squashed)