intermediate throwaway fixing more fluid resolution issues.