Ok. Could you add a comment within the code with the bug number for implementing the flex model here? Thanks!