- updated whole setup