more changes to demo aoo