Second batch of commits