Updated with other functions