Tweaking signature
Before merge from work