current set-up seems okay :)