fix subtype and better particle