Added logic with "this"