handle defaults better