splash handling changes