Added HP and L shapes