Modification from Eclipse