changed new action back to add action
removed unnecessary extract and construct methods
fixed strategy problem