Cleaned for eclipse