Updated to Charles' new code