Ported more Common style