Tested and working

Previews commits where not working perfectly like this one