Change the loading wait and add an extra wait