overhaul of resolve and buddies