refactored patch location
add entities to patch