Reworked eclipse