modify so its more a SPA app