Misc changes, does not loop anymore because that does not make sense.