Updated with read from file