Final changes made by NKICHEV and WOOANNA