Made modifications based on SCP feedback