Updated with latest plunker code