Before refactoring of code
RC1