Changed / added some parts