added live changing