Updated so it's more like Flow's system