Variable name changed, updated comments