Now again with ci awareness