working commi
fixed title
refactor