#85 valid check and animation logic removed!!!