Made it work a little better