Advanced Solars partial fix, needs some remakes