Elvain's tech changes