Added SHAA Class + Padding Function