got rid of magic number