-Still not working -.-
-working solution for extra dataset