Remove the number hardcoding