Merged physics into project