Improved the faggotrizer a bit