Added better processing.