refactoring, fixed too many collision issue with psys.