Commenting out the befores for now