More updates to the setup 3:09PM