Reworking lout endpoints