Tweaked and added