Updated partially to 1.5.1