[m2] Ammended .h layout slightly