Added FIXME and improved formatting
Added FIXME, tried to make tuple of tuple in s9