Preety much the final version