Updated to not show too many debug messages