True, I'd approach it and some other problems in a totally new design, hopefully to bring it to 1 level higher totally.