Seems some parts still not working correctly
ralated to issue #4