Duplicate code problem solved!