Change defaults

Make more optimized defaults