removed and added debug