- Made it functional