added stuff before merge