Trying to make this look a little better