@nightshining overall changes fixed