Made it... slightly more functional?