Updated for prez purposes
Final updatas