Jerome's design update