Updated with init changes