Refactoring and fix the situation when the particle goes inside the planets
Bug fixes