#25 changes applied.