Added defs to basic functions
deleted discrepancy