Tim Updates

Hey Tim,

Pass me ur changes.

Thanks,
Malvik