same changes for medium to make it semantic
speed improvements and cleanup
no robots for now (killing performance!)