Attempting to make everything work every time