rearrange info and debug statements