Better split handling
Get rid of those beeps