rearranged few things