Seany’s changes, still need some minor tweaks doe