Chad's Swift edit