Small changes back towards functional.