Cool, will you modify this PR or submit a new one?