added repeaters, found bugs to be fixed later