Changed around some parameters for better performance