Restructure, change velocity logic to reduce net spam