Constrictor Refactor/Shadow757