refined core flickraw integration code