Added TOP_RIGHT_CORNER variables