Final submit with latest code