Change code to allow for basic debugging