moving callback content to includes