make changes to use inject args better