changes to improve stability