somer refactoring and cmmented (BETA) code add