additions and changes for pundit