changed to static container