Commented out some stuff (temporary)