Added Animation and temporary randomization