Changed to other pointer handling