Added question checking. No deadlocks