putting old fixes back in