A warning to Rafael Nadal and other notorious tennis procrastinators: The dawdling days of time-wasting between points and games are coming to an end, at least at Flushing Meadows.

The United States Open will use a 25-second serve clock at this year’s event, which will be the first time such a system will be deployed in the main draw at a major tennis tournament.

Players will now have 25 seconds from the end of a point to serve for the next one. If they don’t, they will face consequences, which have yet to be finalized. The first violation could incur a warning, followed by the loss of a point and then the loss of a game.

The U.S. Open will also enforce a seven-minute warm-up period before each match to ensure they start on time. Players will have one minute from the time they walk on court to meet at the net for the coin flip. Then they will have five minutes to warm up and another minute before the first serve. Violators could be fined $20,000.