hmmm some tweaks here