redid infra structure
everything works