Bij maj, resolved a lot's of bug...