Refactored additional renditions again