Changed Order and added some info