Hopefully an improvement of the interaction code