Made the intent system better for the app