Back to more clean script