adding in some debug features
resolved conflict