Make it more functional.