Changed some parameters to Lape-friendly.