Declutting initial version 2.