Prepared code for pushing. Need tests' update.