More magic number tweaking