further updates to logic, now also supporting animation=false