trying to fix duplication and positioning bugs