Changed a flag to ease merging later