Added some review comments [FIXME_AK]