more changes n debug