ticket: 6 static updated