working on fetching time improvement