Moving to direct read from file