BUGGY: minor changes