some new stuff added