Added notch and type and stuff