Added methods and gsp's type1 and type2