little modifications for testing reasons and playing around...