q2 solved again. better solution