make it almost worki after Rafals review.