fixes - intermediate state