added some of the old parts back in