Adding current working code