Trying to better deal with eol stuff