Added animation-like on aside + changed namings