Final updates #1