Updated latest source from live demo