Added some temporary debugging options
fixed conflict