Tweaking to figure out the issues