Moved some stuff around
Using right function
Get rid of 0