fixed bug, not working yet
merge