Enhancement + be consistent with Connor's style