Slight modifications for Outfit