Adding all stuff for debug