Latest changes, synching up repo and local