Made it way more simple