added some proper cascading