Fake Data Making improved