Finally combined both ends of the project