update to strato branch 2