a few changes for stability