done up to occurs, need to fix vars