Updated to dev to get static->dynamic->static feature