Improved ghost behavior