Begin fixing invo again...