Not finished, but faster