updated, working on the fill method