Modified to compile and remove 0.1 warning, but not working yet