Add waiting class
Formatting