Reverting to simple shapes, as they seem to maintain accuracy for test purposes.