I have found a simple and clean solution to all the current problems.