Zachs issues fixed