sort of working
try this merge