Implement #31, label changes