Adding in some code I removed unintentionally