trying to fix duplication