multiple changes to prepare app for explotation use