Done for demo3