Made this a little better