Updating graphics-ava branch