changes working, tweaking