Added independent check for things like clean etc