nearing end need small tweaks