Fixed all and should work