smaller changes for debugging etc.