Updated with Dynamic Cell Creation