couple tweaks, no working as expected