Work on debugging section