Commented out some stuff