Modified Andrey files