Added stuff from other project