Final updates
Last commit