Timewap attack changes