updates to shock/subtractor