Improved for IDE