making this a little better