update to merge in illumnarti changes