Restore working,
Fixed errors regarding alley and barrier and remove