Addressed #31 & #35.