Added better support for additional cuts