minor changes for debuggablility