Moved some parameters around to fix no data case