finishing up after some testing