Buddhika's second commit