Adding debugging version