Few debug lines added