1301681054_DiyanaMoreva (final commit)