updated for stability improvements