everything brought up to final version