Final updates #2
Final updates #2