@eyedol the previously repeated code is all handled here now..