changes order of bottomten
merges dev