Waynes changes
Merged both