Commit 3

all except 1