Small Modifications to have a system response for each action