Added back in features I had taken out