Fixing loading, switch to simple requires