modifications after first live try