Complete cleaned tested and working