Commented some stuff out