Few changes, looks good