added changes after reviewing