many changes to get working in Cascade