Changed order and fixed a lil bit ;)