Fixes + New function