UPDATED GOOD AND PROPER