Perhaps a case of over-engineering?