Couple minor extra bits removed