Updated source from Nordin