First Totally working revision! :D