Updated Quartz & Castle