Changed order a bit to make it better