no more shortcuts but no more import errors either :)