seems this would quite a bit cleaner, :+1: