slight refactor and fix breakage upon drop into last spot