modifications to convert to  gemsite, all seems to be working still