Almost there changes