combined with lisa's codes