diff --git a/phone-book.js b/phone-book.js
index 69fb468..1b79220 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -4,12 +4,12 @@
  * Сделано задание на звездочку
  * Реализован метод importFromCsv
  */
-exports.isStar = true;
+exports.isStar = false;
 
 /**
  * Телефонная книга
  */
-var phoneBook;
+var phoneBook = [];
 
 /**
  * Добавление записи в телефонную книгу
@@ -17,7 +17,31 @@ var phoneBook;
  * @param {String} name
  * @param {String} email
  */
+
+var a = true;
+function isIncluded(phone) {
+    for (var i = 0; i < phoneBook.length; i++) {
+        if (phoneBook[i].phone === phone) {
+            a = false;
+        }
+
+    }
+
+    return a;
+}
 exports.add = function (phone, name, email) {
+    if (name !== '' && name !== undefined && name !== null && isIncluded(phone) &&
+    /^\d{10}$/.test(phone)) {
+        if (/^[a-z0-9-]+@[a-z0-9-]+\.[a-z0-9-]+$/i.test(email)) {
+            phoneBook.push({ phone: phone, name: name, email: email });
+        } else {
+            phoneBook.push({ phone: phone, name: name });
+        }
+
+        return true;
+    }
+
+    return false;
 
 };
 
@@ -26,25 +50,117 @@ exports.add = function (phone, name, email) {
  * @param {String} phone
  * @param {String} name
  * @param {String} email
+ * @param {Integer} i
  */
+var boolb = false;
+function upd(phone, name, email, i) {
+    if (phoneBook[i].phone === phone && name !== undefined && name !== null && name !== '') {
+        phoneBook[i].name = name;
+        if (email !== undefined && name !== null && name !== '') {
+            phoneBook[i].email = email;
+        } else {
+            phoneBook[i].email = null;
+        }
+        boolb = true;
+    }
+}
+
 exports.update = function (phone, name, email) {
+    for (var i = 0; i < phoneBook.length; i++) {
+        upd(phone, name, email, i);
+    }
+    // console.info(boolb);
+
+    return boolb;
 
 };
 
 /**
- * Удаление записей по запросу из телефонной книги
+ * Поиск записей по запросу в телефонной книге
  * @param {String} query
  */
-exports.findAndRemove = function (query) {
+var strphone;
+var strl = '';
+function strPhone(i) {
+    strphone = '+7 (' + phoneBook[i].phone.slice(0, 3) + ') ' +
+    phoneBook[i].phone.slice(3, 6) + '-' + phoneBook[i].phone.slice(6, 8) +
+    '-' + phoneBook[i].phone.slice(8, 10);
+    if (!phoneBook[i].email) {
+        strl = phoneBook[i].name + ', ' + strphone;
+    } else {
+        strl = phoneBook[i].name + ', ' + strphone + ', ' + phoneBook[i].email;
+    }
+}
 
+function funRegExp(query, list) {
+    for (var i = 0; i < phoneBook.length; i++) {
+        var re = new RegExp(query);
+        if (re.test(phoneBook[i].name) ||
+        re.test(phoneBook[i].phone) ||
+        re.test(phoneBook[i].email)) {
+            strPhone(i);
+            list.push(strl);
+        }
+    }
+}
+
+exports.find = function (query) {
+    // var boola = false;
+    var list = [];
+    if (!query || query === '') {
+        list = [];
+        // boola = false;
+    }
+    if (query === '*') {
+        for (var i = 0; i < phoneBook.length; i++) {
+            strPhone(i);
+            list.push(strl);
+        }
+        // boola = true;
+    } else {
+        funRegExp(query, list);
+        if (list !== []) {
+            // boola = true;
+        }
+
+    }
+
+    return list.sort();
+
+    // return boola;
 };
 
 /**
- * Поиск записей по запросу в телефонной книге
+ * Удаление записей по запросу из телефонной книги
  * @param {String} query
  */
-exports.find = function (query) {
+var phoneBook2 = phoneBook;
+var count = 0;
+function findToDel(query) {
+    for (var i = 0; i < phoneBook.length; i++) {
+        var re = new RegExp(query);
+        if (re.test(phoneBook[i].name) ||
+        re.test(phoneBook[i].phone) ||
+        re.test(phoneBook[i].email)) {
+            phoneBook2 = phoneBook2.splice(i, 1);
+            // count += 1;
+            // console.info(count);
+        }
+    }
+}
+
+exports.findAndRemove = function (query) {
+    if (!query || query === '') {
+        count = 0;
+    } else if (query === '*') {
+        count = phoneBook.length;
+        phoneBook = phoneBook.splice(0, count);
+    } else {
+        findToDel(query, phoneBook2);
+        count = phoneBook.length - phoneBook2.length;
+    }
 
+    return count;
 };
 
 /**