final issues resolved