Update: trying ot fix is loading bug