Now able to de-comment the other functions