updated status from cyp commit 471b81c