Small changes to short version