added conditional for 'controlled by'