Made some changes in top level to try to speed up create table

Internets seems to suggest that there is not much we can do about the
delay