Added checking mechanism