Fixed and improved split