Update scripts. Finalize solution that works