Added debug and some changes