Made it work a tad better