cleaned up silly double up