Update to new spielberg approach (╯°□°)╯︵ ┻━┻