re-organized, added original parameters from paper