changes for better debugging