Updated avalon edit
?