the --serve is now faster