tweaks - Still need to fix one bug