added E30 right and P104+P105