class issues resolved