first test + small tweaks