Added "self." to lines