updated to latest commits