Re-added future stuff - after all, it didn't seem to hurt