* Made it a little more functional