Changes for debug