Added above/below, cleanup