Loop 190

this has been in production, so merging to our master