just an intermediate add - very dirty code!