Intermediate changes. Eclipse glitchy.