changes to get faster hopefully