bugfixing day 8