updated to handle git