update with latest commits & changes