Making it more functional