Improve achievement / particle management