adding features + working on restart