added debug and other items