work with dev server until the changes settle