Elegante Update

syncing to the TDK