Almost finished Jaluria's recommendations