:+1: But doesn't it make sense to move the logic inside there too?