debugging and cleanup
debugging and cleanup