now with working clean