Updated paper (still work in progress)