Made small updates to make all calls uniform