additing fixes