lots of changes before demo