Reverting delay
Fixing bugs