Updated

Updated some functions