added curves and stuff