added some additional things