completed more includes, still does not work correct