Modified list to NOT use the delay hack