about to make some changes
some tweaks