changes from labctl