Changed settle to only update in current bar if settle flag was set