Merged the given programs with our project