improved operation, added a template - oops gotta check in the template next.