some performance issues resolved