patched for barrier braker final