Changed delay, added supress warnings