Last Changes of previously planned solution

This will be redesigned