edited 1 & 2