updated to note issues 29 and 34