changing names and fix magic number