added And and renamed some other functions