Major rework of Q1.4