Raman - Removed duplicate code