- update for proper command handling for loaders