Consolidated some operations