Updated with W1 Stuff