various stuff added