Updated init and all that like Aidan said