Reworked init and load logic