Expansion of original code