Updated with Codeship flag