Fix and merge for carlie