Trying some optimization