final 1

everything added