Speed up + remove debug