Updated with clean script