switched to Alfred's design