added newest changes