Trying to be a bit more functional...