added in demo mode
tidy up and commenting