added more comments for tracking bug