restructure after santiagos proposal