updated status from lby commit cfdc6cc