Removed extensive debugging