quick fixes before mock 1