added some lost features from last push