some changes and a "problem"