Hopefully untangled 300/400/700 mess