Modernize sample