Updated Code from 7 AM