Trying to tweak a few things