Updated init routine