Pre Michael O tweaks