updating the working branch with last updates