Some cap changes