added changes from other project