added more flag shit