Added checking steps