Comments out non-working bits for speed