fixed & now building