Upgraded Set-Up