incorporated felix pr comments