try for more performance with these changes