finished up redoing basic gates