Preparing to implement HSL mode