fix sun + refractoring