update to strato branch