Tweaked and updated