Fixed bug and uploaded faster/dumber version