some temp changes
some improvements