Update last changes Nikola