removed test calls and magic number