slimmed down to make it through the startup