Working @mk01 suggestion with @CurlyMoo old code