removed pre and post call