FURTHER SIMPLIFICATION - CODE REUSE