Aligning with current code #36