revised signalling & testing