Updated a few more examples for code reusage
Re-worked the common steps