Removed FIXME. Added some more comments