Updated with work changes