Removing hardcoded basicMode parameter