Made it a little better