Tweaks
Removed invalid function call
Merged