Improved some things with Interaction