in progress (restore feature modifications)
Several fixes