Changes to help Stanev