Hopefully fix the issues I've been having