Changed some code around ! =)