Working Mac

Fix Mac slowdowns