modified for slava tests