still have some issues to fix..