Paradrop function refactor