removed some details; added some