Reinstated some missing things