Thanks, fixed. Turned out to be *much* cleaner