Updated version of Krithika's project