*Bugfixing 20%