some changes to connect to the rest of the app