Updating drop-kick based on issue #27