Gets closer to final version