prerelase refactorig