other stuff in case it wasn't in final commit

???