reorganize and add landmarks