Minor changes before adding Animation Class