added some changes/debugging