Dumpin some code

from incoming update