Updates for eviline2