Align with Ben's master; modifications to Custom.lss