Tweeks in the functions