Updated with latest local changes