Commented out somethings