I think it's more clean now...