Avi's Updates

Started working on updates that will work around conflicts.