Attempt some fixing, DO NOT MERGE!