Added clever substitute