This is the main thing we are going to be focused on fixing