Commented out that annoying feature