added some of the missing features