dev before 3rd merge