changes for removing memory warnings