some last minute changes. Last test on flip