+some changes. isolating problem