fix activities to use the interfaces