Working on Mik's suggestions.