lots of new stuff added