execute() refactored #56