Replaced all made in other project into here