Demo and SWC added