pulling PR 7 and 8 updates