more code on avalon2