Added checking against barriers