Adding most recent changes for Drew