New code generating warnings - commenting out.