Changed stuff a little bit... Do not tell foopex :P